From 2b888b8d42cc6e5161dd7ac4d9cc9e1e93d9e206 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 9 Jun 2008 09:46:16 +0100 Subject: [PATCH] minios: use inlines instead of macros for bswap* Signed-off-by: Samuel Thibault --- extras/mini-os/include/byteswap.h | 39 ++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/extras/mini-os/include/byteswap.h b/extras/mini-os/include/byteswap.h index 7c4ffe393c..6d97f78f74 100644 --- a/extras/mini-os/include/byteswap.h +++ b/extras/mini-os/include/byteswap.h @@ -2,21 +2,32 @@ #define _BYTESWAP_H_ /* Unfortunately not provided by newlib. */ -#define bswap_16(x) \ - ((((x) & 0xff00) >> 8) | (((x) & 0xff) << 8)) -#define bswap_32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) +#include +static inline uint16_t bswap_16(uint16_t x) +{ + return + ((((x) & 0xff00) >> 8) | (((x) & 0xff) << 8)); +} -#define bswap_64(x) \ - ((((x) & 0xff00000000000000ULL) >> 56) | \ - (((x) & 0x00ff000000000000ULL) >> 40) | \ - (((x) & 0x0000ff0000000000ULL) >> 24) | \ - (((x) & 0x000000ff00000000ULL) >> 8) | \ - (((x) & 0x00000000ff000000ULL) << 8) | \ - (((x) & 0x0000000000ff0000ULL) << 24) | \ - (((x) & 0x000000000000ff00ULL) << 40) | \ - (((x) & 0x00000000000000ffULL) << 56)) +static inline uint32_t bswap_32(uint32_t x) +{ + return + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | + (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)); +} + +static inline uint64_t bswap_64(uint64_t x) +{ + return + ((((x) & 0xff00000000000000ULL) >> 56) | + (((x) & 0x00ff000000000000ULL) >> 40) | + (((x) & 0x0000ff0000000000ULL) >> 24) | + (((x) & 0x000000ff00000000ULL) >> 8) | + (((x) & 0x00000000ff000000ULL) << 8) | + (((x) & 0x0000000000ff0000ULL) << 24) | + (((x) & 0x000000000000ff00ULL) << 40) | + (((x) & 0x00000000000000ffULL) << 56)); +} #endif /* _BYTESWAP_H */ -- 2.30.2